Revert "(Build-)Depends: tao-pegtl-dev to support external PEGTL (tao)"

This reverts commit 40a6ef7735852b03253692722eeb812e3e8b6ef2.

tao-pegtl-dev 3.2.7 is not compatible with vtk 9.6.

There was MR !11999 to update VTK, but it has been abandoned,
and does not merge cleanly into current source.
https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11999

See also
https://gitlab.kitware.com/vtk/vtk/-/work_items/17876
https://gitlab.kitware.com/vtk/vtk/-/work_items/18151

Cannot close Bug#1035426 until upstream sorts out their pegtl support.

diff --git a/debian/changelog b/debian/changelog
index 90ab3278e6174b5073fecbc7b66fa42f80d4834d..cde5d380ee106efa6274d9f189af47591e7b610b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,7 @@
 vtk9 (9.6.2+dfsg1-1exp5) UNRELEASED; urgency=medium
 
-  * (Build-)Depends: tao-pegtl-dev to support external PEGTL (tao)
-    with -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=ON
   * install vtkQImageToImageSource.h and vtkQWidget* headers to
-    libqt9-qt-dev not libqt9-dev. Closes: #1035426
+    libqt9-qt-dev not libqt9-dev. See Bug#1035426.
   * debian patch build_reproducibility.patch maintains build
     reproducibility by dropping XDMF_SYSTEM (which is set to
     CMAKE_SYSTEM, including the Linux version at build time) from

diff --git a/debian/control b/debian/control
index 9a4eb1ab8dddf433b82b46f9416a82f46dfc1833..417fab164522d65f99e98b128a831655479efe1a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,6 @@ Build-Depends: dpkg-dev (>= 1.22.5),
                python3-mpi4py,
                qt6-base-dev,
                texlive-binaries,
-               tao-pegtl-dev,
                x11proto-core-dev,
                xauth,
                xvfb,
@@ -128,7 +127,6 @@ Depends: ${misc:Depends},
          mpi-default-dev,
          python3-vtk9 (= ${binary:Version}),
          vtk9 (= ${binary:Version}),
-         tao-pegtl-dev,
          x11proto-core-dev,
          zlib1g-dev
 Suggests: vtk9-doc,

diff --git a/debian/rules b/debian/rules
index ee7f961d089dca223d1aae346b9219ef69de89ab..eb2d997c8fa8e5989236b01d421b1159dfcbf47e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,6 @@ extra_flags +=  \
        -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_ogg:BOOL=ON \
-       -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_png:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_theora:BOOL=ON \